Just added some dynamic structures - not completet !