Added ani and notnull.