add features needed to support more grid services