Added quoted string support