Added new class to be more specific