Make it backwards compatible