Validation updates for ams and hlr