adding support to restart, clone etc