Make it working better with sidekiq