Updated message mappers and fixed some bugs