Modification to provider model, setting for null and blank