Add $iterable and some fixes