Reworked Add Host to Aggregate in template