Added some compatability stuff.