Updates based on introducing ValidationMessage class.