Refactor lease policy