Changed addEntry, not ready/tested