Add compatibility for most APIs