More Changes and schema