Change scope of common manager variables to local