1. Moved string related manipulation into adaptor_type