Changed all method calls to be module methods