Drop Qbatch and add some more _ mixins