Updated schema for more detail