Add empty line handling