Allowing custom field names for json parser using annotations
Minor fix for null pointer