Add Guaranteed service and directive modular