[WIP] Clean catalog models

ArrayCollection|CategoryInterface[] ?