Issue #1526452 by wizonesolutions, jlamp, cmcintosh, spiderman, newmediaist, Liam Morland, miksha, JordiTR: Support entities instead of nodes