Added some more string related code