Starting point for refactoring