Adding restart functionality