Added q-expression support