change kind to kind_id