Add CISI TP5
Bug corrections