Switch to using mon-setup