Add promises to prepare the data that just need it.