added nullable option to several fields