Changing to use Reader with validator