Updates from refactoring