Better ACL integration
Many updates to make the system work with the ACL