Use module methods and parameters instead of newing an internal class