Restructured to remove composite collection