Adding MilesStone 8 changes