GEP-41 Added support for grant programs