Logically restructure MessageHandler again, remove getAssociation()