Changes for smarts parsing..