Changing class name to be more reusable