Fix parameter mess, still need to cleanup and rename to make it clearer.
At least at this moment it works....
Simplify and rename the parameter mess of Events & Monitor.