Added String class support