Add ability to use custom fields.