Added in ability to set Tenant (used for commands)