Added space fields handling