We definitely want to keep these in, and add the newer modules too.