Hopefully final schema