Simplify iterator
Add hashset collection
Remove duplicate jso collection wrappers