Updated entries templates