Added legacy mode work