Serializer restructring.