Made sourcing of custom files universal