Add MessageFactory and Tool Box