Updates for refactoring