Updated as we have no plugins/custom facts