Updated with preloaded and wrapper