Separated parser und builder (Upgradable)