Add compatibility code