Changed schema a little