Added zipcode and type fields