Add fields and types tags to fix invalid xml errors