- Synthetic fields handling improved