Adapted module to new registry