Migrating the functionality to the module