Updated the singelton pattern