Removed singleton
Updated docs