Update queryable interface so that it doesn't mutate