Added grant and policy