Adding string support