Updated to use placeholder instead of empty value