Fix EntityBase introduction in generic definitions
Fix Eclipse classpath