Fixed thread interruption handling
Removed dependancy on payload file.
Checks are now dynamic to allow for the payload being updated.