Changed Tenancy system and refactored a bit.