Move normalization and extraction to serializer