Changed scope of AGN* variables