Bug Fixes.
Added @Entity annonations