Parser updated with breadth info
Main merge fixed