added tenant context support