Move deprecated APIs to compat