Changed to singleton pattern