Refactored the Account model and related areas to support multitenancy