Added @Entity

Slowly adding changes to see what caused the problem