Fixed invalid import inside the message classes