Added nullable and defaults