Add helper methods
Added helper method to get root entity key attribute definitions
Merge changes in master branch