Changes to codebase