New Update Directory implementation.
Fixes issue #3