Updated to use annotated services