Reworked object handling for Opauth