Added support for not null