Used own fork of serializer to fix bug with unserializing