Change class ierarchy, extract MessageType enum to separate class