Modifications due to upgrade Foreman software