Update way to manage kinds in symbols