entity changes
Merge pull request #186 from aptara/Sushil

entity changes