add sidekiq handler, refactor sidekiq integration a bit