Work on auto dependency resolution