Updated address markup, renamed "state" model property to "stateOrRegion", added user service.