Added semantic to auto-complete