Validation updates for ams and hlr
Merge pull request #6 from pesicvladica/master

Validation updates for ams and hlr