Cleanup
Add esm_class and validity_period to msg_info
Add xref checks