Remove the static modifier from the class variables due to the use of
singleton pattern.