Switch to plug / foundation + simplify