Better module control