Replaced static with singleton-functionality