Changes to tables from core
Mockups: update tables to reflect core change