Update trait definition and all usages