Added auto loading of secondary collections