multi-entity support