Enhanced assembly to put output in parent/target and removed some unnecessary deliveries
Refactored assembly