Move from common to device specific