Design changes

Attempt to apply https://gerrit.wikimedia.org/r/#/c/93002/ in a less hacky way

Change-Id: Ib375e362a36231c572cdfba95401fd6b4c6b4faf
Merge "Design changes"