Starting refactor for easier overriding