Add device listing and change message types