Fixed bug in collections in apiserver
Controllers are now entities