Moved droplets to a singleton class