Slight change in desing to simplify

    - Use only one data source for templates