Documentation improvements
API doc updates
Fixing entity reference