Added more annotations to please linter.