Updated codebase for simplicity