added nullable(true) where necessary