Handle default tables in singleton