Better manage scope