Added data templates