Add backwards compatability