Simplify Grant Management