Temp commit: DirView for enumeration
Better lazy-loading; fix DirView