Further refinements for code structure - got rid of the legacy message handling