Some refactoring and small new serializers