Add -k support