Added some nice compatibility code.