[KF|EM] #tech added new data classes