Added a bunch of legacy stuff