Use builder instead of shadow methods