Support independant code blocks, fix variable declaration without instantiation