Add Collection service & tests