Updated how thread enforcement works