Adopted to the recent net_skeleton