#5 Simplify design