Add support for empty strings