Updated schema, improved readability