New version of schema

Thanks to Rikard "Ornotermes" Lindström for the help