Updated Grinder framework