Refactor, refactor, refactor
Support multiple content assist types