Switch to better storage structure for Deque