Updaing singleton method. Fixes #3