Ensure backwards compatibility