Move some sourcing in order to correctly use everything