Update standalone to expose when