Updated to new module system