Changed from static to singleton