Add containsAll
Merge and fix containsAll