Made some changes for Pythonless mode (testing purposes)