Datastore validation

Input parameter validation needs some fixes