Updating annotations to include non-null