Added new and extra fields handling.