Fixed: tests
Improved: dynamic fields handling