Extract unit domain decorator to separate file