Added preliminary support for non-commercial YQL usage.