Updated schema to improve/fix the "create" operations.