Fix?
Added group converter
Marked as converter
Added @Override
Support for nulls
Some fixes