Missing changes from refactoring