Add option to not fill blank data