Add Entity

Add missing entity methods & improve javadocs

Add Entity

Removed invalid code

Add Entity