Add support for non direct field type