Added qId functionality