Move option into Monitoring