Handling MESSAGES mechanism added