Added custom fieldName option