Fixed bunch of type errors related to new version of Narwhal
All pojo classes have been simplified
Merge branch 'develop'