Improved module moderation support (WIP)