Updated with Document DomainManager & Controller