Converted global class variables to global variables to avoid warnings