New templates and refactoring around unit value