Added state class arrays