Added notnull annotations