Template system added