Adding missing @NotNull... for consistency
adding serialize method to jsonutil
adding better group-id