Updates for refactoring
Updates for refactoring