Refactor to avoid package clash with offline SDK