More refactoring - partially decoupled the requestor