Updated legacy wrapper.