Moving to multipage architecture