Feature/org serializer