Added option to store client id and secret