~ Added new state classes