Consolidate defintion change