changed annotations to improve auto-suggest