Refactoring; changed unit to converter; added device