Updating NN to use ImmutableList for thread safety