Updated schema again