[TypeDevices] refactoring