Working on moving Gacela and on removing Gacela as an injected
dependency