Make more backwards compatible