Updating detection to new module style