More work on Templates