Add valdiation of basic data types