Modified build dependencies hierarchy