adding changes to deployment engine based on first architectural review