Make modules more independed from each other