Added new locaiton fields to tools model