Improve handling un unrecognized annotations