Refactoring Bigfoot services