Updated for the refactoring