Added some stuff to the eNovance use case.