Added city and state fields on create/update course