Added more input support on CQL