Changed some properties to be nullable