changes made to cope with multipe source definitions