Fix issue with extending services