Add skip_doorkeeper_for (and other refactors)