Add backwards compatibility for API changes