Added more managing classes around messages.