Updates to use lazy loading and resort by name