Make resolver independent of source