- refactored kind to enum