Update to work with new modulelist interface