Added legacy support