Internalize serializers

Please review