Added onKeys / keyPredicate methods