Updated to 1.1 No longer uses singletons