Add comps from core Foreman repo @ c41e2f4