Initial switch to Feign