[KF|EM] #refactor - use newly created attribute classes