Preparation for google integration