Updated EventPublisher and model validates default values