Added 5 more extra fields