Added some extra informations