issue#204 - tweaking Entry files (class, manager, data accessor)