Template definitions
Merged solution with new added items