Updated with kinds