improve site-functions sourcing