removed NullProvider as it isn't really needed