Plugin Views Refactor