re-added cases for data types