Updated Serializer, should actually work now.
Merge remote-tracking branch 'origin/master'