added basic integration with doorkeeper changes