Added validation to change functions