#105880# Reorganize service info to support registered and additional services; Add support for singleton registration