Support for more fields (WIP)