Made non nullable attributes nullable