Move to OSchemaHelper as more convinient way to change schema