now supports persistent endpoints