Adapting to version 3.1.0