Add additional fields based on need