Jamie H - Added legacy support.