Added logic to Trader/Location/Service models