New class for more cohesion