Added MetaMessage and StateMessage support