Add extract option to CLI