Split setup and update