Added locations and new datafields to owners and assets