Added necessary classes