Feature/root path revisited