Handled null value for extra_data and display_values options.
Used class_name.underscore in place of class_name.downcase, to better handle CamelCase classes.