Final schema review