feat: update codebase with latest changes