Adding in tenant isolation for definitions and public definitions for mock