XD-381 Implemented TapDeployer