Added support for LOCATE operation