Update related to version 2.0