Updates after refactoring