Made some model fields optinal