For the sake of completeness: fix for a pretty nasty bug in the dao enrichment. Actually, I dont know what was I thinking, the whole implementation was broken. Also upgraded dependency versions.