ContentAssist added. Fixes #596