is there a way to avoid the singleton like we do elsewhere?