added legacy support