GDataHelper Updates/Reorganization