Fixed the incomplete previous class to module conversion