Rewritten service definitions for extend capability