Resync with current modulesets