Updated ACL, Entities and Services