Add collections
Rework interface and behat tests