more addEntry changes