Solve little issues with singleton pattern and subclassing