Added service metrics
Fixed command timeout default parameters