Add 2nd address field just in case the company has a po box. Add view helper in companies model to add a ',' in between address1 and address2.