Global variables support added. Dictionary indexes fixed