[MOD] Add table to be more specific