Add notnull annotations