Refactoring the xwalkwebdriver to match the actual xwalk