Jc 2032 code review refactoring

http://jira.jtalks.org/browse/JC-2032
Having Map<String, Object> would look easier IMHO because you'll be easily request for a property by its name. And no need for additional entities.