Making base queryable better