Fixed MM+Table bug, created TokenType for new BC.