- added legacy support