FIxed #10: Data validation rather than type checking