Reflect latest wboss changes