Added support for space