Add initial support for CER-ID