Change to singleton class. No need for instances