Added socket monitor support