Update constants from latest psc
Update Kinds