Refactoring hard-coded crap into handcrafted proxy