Favor entry adapter usage over entry listener

Refactoring for tests.