Improve usage of the Simple Factory with new API additions
Improve usage of the Simple Factory with new API additions

media-explorer/media-explorer,media-explorer/media-explorer,media-explorer/media-explorer,media-explorer/media-explorer