Remove generic from connection handler so we can use the same across all repositories