Updated schema, not working properly