Added --extract-only option