Added Paris features plus changes to support Paris deployment