Fix dependency mapping