add legacy support