Consolidated backwards compatibility handling