Initial adoption for latest cake standards