Added atoms to handle key & secret