Added monitoring switch and improved information gathered by monitoring