Update message switch to 0.9.4