Switches to interface addon to reduce duplication