Refactored to rely on bundler gem directly