ported chevalier types to chevalier-common