Better schema definition

(no more warnings on startup)