Adding source validation