PEP-011: DIVA 2