Added custom serializer/parser and updated JSON references