Added more API compat