Add support for locate command
Tweak location