Added support for space before keywords