added address and improved other models