Add resolve for annotations and type parameters