Redid architecture with more templates