Folderish optional

Helpers to update base class