Added dispatch tables