Better module separation