Fix entities

* Add missing use statement for Doctrine annotations
* Add missing IDs