made the schema a bit better