Improved vector and string handling.