[PATCH] message types updated