Refactor physical unit support