Added company management to acl manager and performance optimizations