Changes related to version 2.1