Updates for code refactoring