Why do this here if we already do it in the Connection object?