Add some legacy stuff