Fix #13 - Updated pojos to support newer server versions and new capabil...

...ities merging new files with existing ones to don't break compatibility