Added some extra fields