Added default data types