Added support for whitespaces