Added not_null, to be still worked out