Changes related to validation and setting