Improved to avoid xpaths