More flexible form field population