Changed internal singleton visibility from private to package-private