Add gracefull stop