Added legacy code