Added droplet group and states