Changes in validation