Templates system added