Made some attributes required