Fixed service handling in Extension.