Update for new location of certs
Added support for "inactive" systems