Feature/serializer support