diff --git a/init/coc.vim b/init/coc.vim
index f26824b..c378414 100644
--- a/init/coc.vim
+++ b/init/coc.vim
@@ -20,3 +20,18 @@ inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm() : "\<C-g>u\<CR
 
 " Project refactoring keybinding
 nnoremap <silent> <leader>pwr :CocSearch <C-R>=expand("<cword>")<CR><CR>
+
+" Go to definition
+nmap gd <Plug>(coc-definition)
+nmap gi <Plug>(coc-implementation)
+nmap gr <Plug>(coc-references)
+
+" Jump between diagnostic positions
+nmap <silent> dk <Plug>(coc-diagnostic-prev)
+nmap <silent> dK <Plug>(coc-diagnostic-prev-error)
+nmap <silent> dj <Plug>(coc-diagnostic-next)
+nmap <silent> dJ <Plug>(coc-diagnostic-next-error)
+
+" Show full diagnostics list
+nmap <silent> <leader>dd :CocDiagnostics<CR>
+
diff --git a/init/keys.vim b/init/keys.vim
index 0489dbc..ffc5f5d 100644
--- a/init/keys.vim
+++ b/init/keys.vim
@@ -6,9 +6,9 @@ nnoremap G Gzz
 
 " Navigate between ctags
 " Jump to definition
-nnoremap gd <C-]>
+" nnoremap gd <C-]>
 " Go back up stack
-nnoremap gb <C-t>
+" nnoremap gb <C-t>
 
 " Remap split navigation keybindings
 nnoremap <silent> <leader>h :wincmd h<CR>
diff --git a/init/nerdtree.vim b/init/nerdtree.vim
new file mode 100644
index 0000000..3c27378
--- /dev/null
+++ b/init/nerdtree.vim
@@ -0,0 +1,3 @@
+let NERDTreeIgnore = ['\.vim$', '__pycache__', '\.pytest_cache', 'venv', '.*\.egg-info', 'dist', 'build', '\.eggs',
+            \ '.git']
+let NERDTreeShowHidden = 1
diff --git a/init/tagbar.vim b/init/tagbar.vim
index 45332f3..998c803 100644
--- a/init/tagbar.vim
+++ b/init/tagbar.vim
@@ -18,4 +18,4 @@ let g:no_status_line = 1
 autocmd BufNewFile,BufReadPre *.py,*.java,*.rs,*.cpp,*.c TagbarOpen
 
 " Explicitly close tagbar for these types
-autocmd BufNewFile,BufReadPre *.md,*.vim,*.txt TagbarClose
+autocmd BufNewFile,BufReadPre *.md,*.vim,*.txt,*.yaml,*.yml,*.rst TagbarClose