Added fugitive and dict lookup