Removed where_extra, using custom_data instead.