Added ability to handle strings