Add new transport entities and improve message builder