Changed some data types