Changed some default values to null