Add new object for handling singletons
Fixes for jshint