YH-294: Initial separation for data types