Added --kinds option.