Added blank line handling