Improving scripting (doing imports as late as possible and changing for explicit class declarations on some cases).