Slightly update on some data types