Added extra fields and label callback.