Fixed client in monitor checking and added mapping notify listening