Added space parsing support