Futher refactoring of service connection storage