Added NotNull annnotations