Fix map structure , add stack and queue