added property_id column at the end