Updated to comply to version 1.2.0