Reduced unit code duplication