Update entity attributes from private to protected to allow for extensio...

...n by custom entities.