OnDemand does not setup every item in optional directory. it is user selectable, by extension, title and binary (if any) to execute. It is obviously a new and totally optional feature and as has been the case with all new features it will be enhanced as we move forward.
The introduction of OnDemand in no way changes how one would manage their optional directory.