Added parsing of leader and control fields