Merge "Creating a generic monitor"