Rework module system for new ACL