Corrected sourcing of functions