More work on the design, added dummy informations