Conform to latest structural conventions established in wl2