Added options to all the datatypes