Provide compatibility with v6.0