Changes for build without using extra restriction hierarchies.