Modify singleton to be readonly