Add ability to disable origin check