Update boolean to accept null/undefined values if not required
Add Saveable