refactor: replace overrides by browser layer