Added Validation and Refresh