Added null / not_null