Updated to handle the breaking changes to Foreman