Updated sanitization and setting fields