Added some legacy code