Setting up for more strictness in static singleton