updated for services and components body