Turned to Class based keys