Feature/serializer refactoring