add annotations for entities
bugfix: add missing imports