Feature/robin queries