Updating annotations to go w/ types