Separating rebuild result type from other actions