Start using the module API again and slightly change the workings