Reworked the $collection service