[-TASK] Refactored Export of Entity Types