Move checking of data to model - client