Digvijay : refactoring of connection points