Updating to conform to new module definition style