Add hex identifier and more checks.