singleton api corrections