Added state classes