[FEATURE] Updated the codebase to use DOM only