Refactor unit definitions