MAJOOOR COMMIT !! Separate oauth to connect modul