[v6r11] Fixed instantiation and many other things