Enhanced message system & added Workbench integration