added serializer handling