Making access_token & site_id optional