added dispatch tables and fixed classtags