Adding type and rare flag (incomplete)