Added support for extraction

Improved by to support bulk operations