Improve colleciton loaders