Added support for more drops