Move source fetches into separate steps ?