Add raw types