add cherry picked modules