Added support for hiera derived targets and slaves