Added fetching of external templates