Added compatability