Updated setters to leverage sanitization