CDI index

closes #2