Added new tables for compatibility with table grainularity