Improved Codebase