Add backwards compatability to previous restructuring