Added partial templates