Updating the codebase