Refactor from old Tuples to new EntityApi
Merge pull request #1004 from erwinwinder/master

Refactor from old Tuples to new EntityApi