Added API V2 compatability