Simplify it by removing request dependency