Made refactoring easier by introducing new classes