Madeway of defining dependencies more consistent.