Removed collectionapi package and created a custom API