Fix for multidict + complex directory tree, small interface change