Added state map and related models