Reworked traversal macro structure