Updated build architecture