Added skipping undefined annotation and static fields