Moved method to serializer