Changed from object to singleton