Added where support, removed Gemfile.lock