Added more data validation/converter.