Added EntryListener support