Rework architecture, ext symbols missing