Fixed issue with dependency mapping for referencing deependencies