Doorkeeper changes