Updated Address model and controller