added custom field support
switched to implicit block