Added Messages file and streams for client