improve enable monitoring mechanism
resolve merge