Updated monitor for more flexibility on init