more entity API impl and improvements
6 files changed