Further module separation