Updated schema to attributes