Added ability to ensure single without predicate