Add: Improved Encoding (Test-Development)
Add: Improved Excel (Test-Development)