Feature/mapped directories