Whoops. Added support for all message types