* Fix mapping rules for dependencies