Add serializer (oops)
Merge to local changes