Add Google new API compatibility