Add missing entity methods & improve javadocs