Replaced usage of RestorableModel_TO_BE_OBSOLETED with usage of
RestorableModel.