More CR changes. Improved offline_access check and added scope to method params