Surveillance component was added as core component