Implemented a more complete version of orgauth generator