Add validating on save