Fixed DataService validate