Add support for empty string