Add changes for auto-complete and yasnippets