Change QueryBase class to Queryable mixin