Explicit Hiera call and few other changes