Less global state
Update build plans