First commit. ModelFactory must be ok
Updated EventPublisher to version 2.5.0