Added ability to disable id sanity check