Fixed includes
Added type tag string checking for messages