Added more message format stuff