Moved contains to ITraversable + other fixes