Updated schema for sanitiy