Add conditions check for data types