#21938726722108: Adding Component Annotations to the Services