Add fabric and update service app scaffolding