Extend ServiceFiles with MessageValidators
#636
+13
−2
Merged