Tuning some descriptions and adding a MessageFactoryInterface