Added --status and --resume