Fix Namefail and add some more structur