Adjust base.keys to new modules