More work with ACL manager and related entities