Adapted the module to the new design