Add q definition and dependency