Added status to state map, to pass the new state_map checks