Added serializer & normalizer