Updated with all data types