Trying compatibility with version 2.0.0