Restructured schema more