Move some functionality to new iters of skeleton