Changed logic within Trade map setters